Cope with missing configuration information inside the configuration method.

This allows us to better recover if the store has been deleted.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index bfc559f74f9eb3452a03d87ed1ee04a14e0aa467..34bc4278c6435d471dc44624358c74fd66b8644e 100755 (executable)
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -69,8 +69,10 @@ class BlkifController(DevController):
                                                   'dev', 'type', 'params',
                                                   'read-only')
 
-        result.append(['dev', dev])
-        result.append(['uname', typ + ":" + params])
+        if dev:
+            result.append(['dev', dev])
+        if typ and params:
+            result.append(['uname', typ + ":" + params])
         if ro:
             result.append(['mode', 'r'])
         else:

diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index d195363ba5fd7e2d88cb52960130377382e32305..6041e5ed467c3dea0f7f9e074769fbcbb4e6a1f0 100755 (executable)
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -80,11 +80,15 @@ class NetifController(DevController):
                                                      'script', 'ip', 'bridge',
                                                      'mac')
 
-        result.append(['script',
-                       script.replace(xroot.network_script_dir + os.sep, "")])
+        if script:
+            result.append(['script',
+                           script.replace(xroot.network_script_dir + os.sep,
+                                          "")])
         if ip:
             result.append(['ip', ip.split(" ")])
-        result.append(['bridge', bridge])
-        result.append(['mac', mac])
+        if bridge:
+            result.append(['bridge', bridge])
+        if mac:
+            result.append(['mac', mac])
 
         return result